From fe1380e0c41a4e42c294e0c01caac125eb924755 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 22 Jul 2005 16:10:32 +0000 Subject: [PATCH] Point out escaping oversight. (#311260, Owen Taylor) 2005-07-22 Matthias Clasen * gtk/gtkmessagedialog.c (gtk_message_dialog_format_secondary_markup): Point out escaping oversight. (#311260, Owen Taylor) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmessagedialog.c | 12 ++++++++++++ 4 files changed, 27 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1798f44b32..3753d9c683 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-07-22 Matthias Clasen + + * gtk/gtkmessagedialog.c (gtk_message_dialog_format_secondary_markup): + Point out escaping oversight. (#311260, Owen Taylor) + 2005-07-21 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): Cleanup diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1798f44b32..3753d9c683 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-07-22 Matthias Clasen + + * gtk/gtkmessagedialog.c (gtk_message_dialog_format_secondary_markup): + Point out escaping oversight. (#311260, Owen Taylor) + 2005-07-21 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): Cleanup diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1798f44b32..3753d9c683 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-07-22 Matthias Clasen + + * gtk/gtkmessagedialog.c (gtk_message_dialog_format_secondary_markup): + Point out escaping oversight. (#311260, Owen Taylor) + 2005-07-21 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): Cleanup diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index 5ca713d1c0..443baa43c5 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -599,6 +599,18 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog, * Note that setting a secondary text makes the primary text become * bold, unless you have provided explicit markup. * + * Due to an oversight, this function does not escape special XML characters + * like gtk_message_dialog_new_with_markup() does. Thus, if the arguments + * may contain special XML characters, you should use g_markup_printf_escaped() + * to escape it. + * + * gchar *msg; + * + * msg = g_markup_printf_escaped (message_format, ...); + * gtk_message_dialog_format_secondary_markup (message_dialog, "%s", msg); + * g_free (msg); + * + * * Since: 2.6 **/ void -- 2.30.2